bitkeeper revision 1.1179 (420c8b725LGvAqm86f8YBLnAnaHPvQ)

Fixup the fixup code a little.

Signed-off-by: sos22@cl.cam.ac.uk.

diff --git a/xen/arch/x86/cdb.c b/xen/arch/x86/cdb.c
index 4ba5b307bfd89ebef74d30a8fc99474a2b61b337..33e516628bc23ae47ea3e78aa9a21327059b8927 100644 (file)
--- a/xen/arch/x86/cdb.c
+++ b/xen/arch/x86/cdb.c
@@ -38,9 +38,13 @@ dbg_copy_from_user(void *dest, const void *src, unsigned len)
        __asm__ __volatile__(
                "1:     rep; movsb\n"
                "2:\n"
+               ".section .fixup,\"ax\"\n"
+               "3:     addl $4, %%esp\n"
+               "       jmp 2b\n"
+               ".previous\n"
                ".section __pre_ex_table,\"a\"\n"
                "       .align 4\n"
-               "       .long 1b,2b\n"
+               "       .long 1b,3b\n"
                ".previous\n"
                ".section __ex_table,\"a\"\n"
                "       .align 4\n"